Hi, on Monday 14 November 2011 03:45:00 Alvaro Soliverez wrote:
> Hello Jack, > I usually stick to a simpler workflow without using git stash and smaller > commits, which git encourages. > > My usual workflow is the following: That's what I have come up as well. I call my bugfix branches 'bko-###' and use the number. > git checkout master > git pull -r > git checkout -b bugxxx <------ this creates a new branch > <write code, test> > git add <file1> > git commit <file1> <file2> > git checkout master > git pull -r > git checkout bugxxx > git rebase master > <solve conflicts, if any> > <write some more code> > git commit <file1> The following should not take too much time as there is a potential gap that another developer pushes his stuff as well. We're a small group, so the probability is rather low I guess. All I do is repeat the pull -r just to see that no changes are necessary and then I merge immediately followed by the push. Also, a trailing pull -r will resync your local master branch. > git checkout master > git pull -r > git checkout bugxxx > git rebase master > <solve more conflicts, test> > git checkout master > git merge bugxxx > git push > git branch -d bugxxx <--- this is optional. it removes the branch > Slowly getting an idea how things work. But I am sure, there's a lot more to it ;) So far, it's fun and I like the (fast) switching between branches. I keep a bko-238105 around for quite some time (I had it even before we switched to git here as a local branch - now you know what I am working on in case I find some spare time). -- Regards Thomas Baumgart GPG-FP: E55E D592 F45F 116B 8429 4F99 9C59 DB40 B75D D3BA ------------------------------------------------------------- As soon as there is an optimist who discovers a light that does not exist there is a pessimist who blows it out. (Giovanni Guareschi) -------------------------------------------------------------
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ KMyMoney-devel mailing list KMyMoney-devel@kde.org https://mail.kde.org/mailman/listinfo/kmymoney-devel
