Re: [boost] [git] Pushing commit(s) after pulling

Subject: Re: [boost] [git] Pushing commit(s) after pulling
From: Schrom, Brian T (Brian.Schrom_at_[hidden])
Date: 2014-08-19 00:09:06

If you can run 'gitk --all', it's very helpful for seeing your commits and branches and gives a reasonable interface for some features like cherry picking or branching on a commit. Gitk runs on Linux/cygwin, not sure about others.

The next time you've made changes, run before you synch, after git fetch, and after git pull paying attention to where the markers are. Then you can decide if you want to rebase or merge by how history looks, it's also pretty easy to try alternates out on scratch branches.  This, and git gui, are what got me over the git hurdle and start really enjoying using git. Hope it helps.

PS apologize for the top post.

________________________________
From: Boost on behalf of Edward Diener
Sent: Monday, August 18, 2014 7:53:03 PM
To: boost_at_[hidden]
Subject: [boost] [git] Pushing commit(s) after pulling

I share a library with others and make some commit to a branch of that
library. Then I try to 'push' the commit, only to be told that there are
changes that have been made which I need to 'pull'. So I 'pull' the
latest changes for that branch, and luckily there is no conflict(s) with
my local commit(s).

What do I do now ?

I can 'push' my changes successfully but then the history of my
particular changes appears to be lost.

Am I supposed to revert my changes to the local repository by doing a
'reset' and then reapply those changes ? That seems onerous.

What is the right way to 'push' my changes and still preserve the
history of each one of them on the remote repository ?

_______________________________________________
Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost