Bring branch up to date with master changes.

Here's the place for discussion related to coding in FreeCAD, C++ or Python. Design, interfaces and structures.
Jee-Bee
Posts: 1065
Joined: Tue Jun 16, 2015 10:32 am
Location: Netherlands

Re: Bring branch up to date with master changes.

Postby Jee-Bee » Thu Nov 02, 2017 7:37 pm

Nice summery!!
Something for at Wiki?
chrisb
Posts: 9050
Joined: Tue Mar 17, 2015 9:14 am

Re: Bring branch up to date with master changes.

Postby chrisb » Thu Nov 02, 2017 10:38 pm

Jee-Bee wrote:
Thu Nov 02, 2017 7:37 pm
Nice summery!!
Thank you, I really struggled with this. But then I thought: this git stuff cannot be the show stopper for new developers
Something for at Wiki?
Yes, but hopefully someone can shed some light on the errors during the first checkout.
User avatar
Gift
Posts: 280
Joined: Tue Aug 18, 2015 10:08 am
Location: Germany, Sauerland

Re: Bring branch up to date with master changes.

Postby Gift » Thu Jun 14, 2018 6:00 pm

How I cleaning up a branch after the merge. Delete it and create a new?
wandererfan
Posts: 1625
Joined: Tue Nov 06, 2012 5:42 pm

Re: Bring branch up to date with master changes.

Postby wandererfan » Fri Jun 15, 2018 12:09 am

Gift wrote:
Thu Jun 14, 2018 6:00 pm
How I cleaning up a branch after the merge. Delete it and create a new?
How bad is it?
If it is just a few conflicts, use "git mergetool" to start a conflict resolution program like meld.
If it is pretty bad, "git reset --hard lastgoodcommithash" to get back to your last good state.
If it is hopeless, then your solution is good.
triplus
Posts: 7038
Joined: Mon Dec 12, 2011 4:45 pm

Re: Bring branch up to date with master changes.

Postby triplus » Fri Jun 15, 2018 12:35 am

Normally you would create a new branch for each PR. After the merge for sure you can delete the branch.

P.S. As for keeping your fork (your local master branch) in sync (with upstream master branch):

https://help.github.com/articles/syncing-a-fork/
User avatar
Gift
Posts: 280
Joined: Tue Aug 18, 2015 10:08 am
Location: Germany, Sauerland

Re: Bring branch up to date with master changes.

Postby Gift » Fri Jun 15, 2018 5:33 pm

Thx you both.