hi Everybody,

the workflow that we need to use to work with Denis is the following:

* Denis will not merge from our repositories (at least for the time
  being).

* This means that the work we do in our repositories needs to be
  synchronized (in git terms rebased) every time he commits to his repo
  (and pushes it).

This is very similar to the way postgresql operates. In postgresql
repositories track the master, but when they have commits they send them
via email (squashed into a single commit).

http://wiki.postgresql.org/wiki/Committing_with_Git

The most important part that you need is the following. you need to tell
git that the changes you make to master must be rebased to the changes
that Denis does. 

For example, the current HEAD of my master is this, one commit ahead of
Denis.

----------------------------------------------------------------------
commit 2e47f2b117fa3337936ab9d02516907e4e457f2b
Author: dmg <d...@uvic.ca>
Date:   Tue Jul 3 17:18:39 2012 -0700

    Added README.org to distinguish my branch from upstream

commit 7c2144bdaae0a541870059246e36726cd850322c
Author: Denis Auroux <aur...@users.sourceforge.net>
Date:   Mon Jul 2 16:45:48 2012 -0700

    cleanup code for alternate clipboard targets
----------------------------------------------------------------------

I want to merge Denis changes, but keep my commit ahead of his. By
running the next two commands from the xournal directory where the repo is:

git config branch.master.rebase true
git config branch.autosetuprebase always

You only need to run these commands once.

the next time I do a git pull my repo looks like this. Notice how my
commit was rebased to be put in front of his new commit.

----------------------------------------------------------------------
commit 9ca1c3269fc21901bba32f7d55fb01b5f76d570a
Author: dmg <d...@uvic.ca>
Date:   Tue Jul 3 17:18:39 2012 -0700

    Added README.org to distinguish my branch from upstream

commit 7e2888f7e255111d441d9214d652b824263dccb8
Author: Denis Auroux <aur...@users.sourceforge.net>
Date:   Tue Jul 3 19:52:25 2012 -0700

    deleted autoconf/automake generated files, revised win32/Makefile

commit 7c2144bdaae0a541870059246e36726cd850322c
Author: Denis Auroux <aur...@users.sourceforge.net>
Date:   Mon Jul 2 16:45:48 2012 -0700

    cleanup code for alternate clipboard targets

----------------------------------------------------------------------


Now if you are working in any branches, after you pull  from Denis repo
into your master, switch to your branch and rebase it:

git rebase master

hopefully that is all you need for the time being,

--dmg



-- 
--
Daniel M. German                  
http://turingmachine.org/
http://silvernegative.com/
dmg (at) uvic (dot) ca
replace (at) with @ and (dot) with .

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xournal-devel mailing list
Xournal-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xournal-devel

Reply via email to