Re: [git-users] Question about when to merge master into my feature branch

From: Gergely Polonkai Hello, during my GitHub based development (which is pretty much similar to what you just described) I do the following: • fork the original repo, so that my GH account has a copy of it • clone the forked repo to my machine • add the original repo as a second remote and

Re: [git-users] Question about when to merge master into my feature branch

Hello, during my GitHub based development (which is pretty much similar to what you just described) I do the following: • fork the original repo, so that my GH account has a copy of it • clone the forked repo to my machine • add the original repo as a second remote and name it "base" • start my

Re: [git-users] Question about when to merge master into my feature branch

On Mon, 28 Dec 2015 22:07:38 +0100 Magnus Therning wrote: [...] > 2. I've chosen a prefix for published branches that may be rebased, > "devo/". I then make sure to communicate to the rest of the team that > it's not safe to base any work on branches named liked that. Just

Re: [git-users] Question about when to merge master into my feature branch

2. I've chosen a prefix for published branches that may be rebased, "devo/". I then make sure to communicate to the rest of the team that it's not safe to base any work on branches named liked that. Just out of curiosity: why "devo"? :-) Is it by chance related to some term related to

Re: [git-users] Question about when to merge master into my feature branch

Ben Rubinger writes: > Hi Steve, > > Thanks for your reply. Your input is helpful. I've spent the past five > days reading through this book: > > http://www.amazon.com/gp/product/B008Y4OR3A > > My hesitancy around rebasing was around the fact that (if I understood > correctly) all rebased

Re: [git-users] Question about when to merge master into my feature branch

Hi Steve, Thanks for your reply. Your input is helpful. I've spent the past five days reading through this book: http://www.amazon.com/gp/product/B008Y4OR3A My hesitancy around rebasing was around the fact that (if I understood correctly) all rebased checkins are deltas, having different

Re: [git-users] Question about when to merge master into my feature branch

, December 28, 2015 2:46 PM Subject: Re: [git-users] Question about when to merge master into my feature branch Hi Steve, Thanks for your reply. Your input is helpful. I've spent the past five days reading through this book: http://www.amazon.com/gp/product/B008Y4OR3A My hesitancy

Re: [git-users] Question about when to merge master into my feature branch

On 27/12/2015 15:09, Ben Rubinger wrote: > Hi there, > > I'm pretty new to GIT. I've got a feature branch which I created off of > origin/master, and after some time I created a pull request to be > reviewed. I noticed that instead of saying that my branch could be > automatically merged with