Sending patches to OpenBSD and getting them merged is the dopamine kick we all desire.
Remote
Jan
@js@x0r.be
Something with computers, mainly OpenBSD, Elixir and a bit of FreeBSD.
0 Followers
0 Following
11 Posts
Joined February 25, 2018
Open post
9
2
2
0
Open post
Net negative commits (in lines if code) are pure enjoyment.
4
1
1
0
Open post
Replying to
@einbeispiel Du siehst da das Herstellerlogo und die Seriennummer wenn ich mich nicht komplett täusche. Juweliere koennen weiterhelfen. (Eheringe von z.B. Niessing enthalten Nummern dieser Art.)
2
0
0
0
Open post
Replying to
@lw Exactly, do not push to main from dev and merge the branches when they are ready to be released. When everything is upstream switch back to the main branch on dev and update.
- create a new branch (the feature branch and do your work)
- test
- push the branch to your private repo
- pull it wherever you want and merge it into the official repo (or pull directly from another source e.g. your private repo)
- update your devs main branch and do the next thing
1
1
0
0
Open post
Replying to
@lw I'm not sure how experienced you are with git. I recommend reading upon the differences between merging and rebasing, branches and possibly cherry-pick.
I think you want to work with feature branches in this scenario and not on the main/master branch on your dev machines.
I _hope_ I understood your scenario.
0
3
0
0
Open post