[Conkeror] Firefox blocks installation of Conkeror?

Brian May bam at snoopy.apana.org.au
Thu Jan 3 15:38:00 PST 2008


>>>>> "Daniel" == Daniel Hengeveld <daniel at zedh.com> writes:

    Daniel> git fetch origin
    Daniel> will update your remote branches.

    Daniel> You can update your working copy with the newest changes in master with:

    Daniel> git merge remotes/origin/master

    Daniel> It is important to remember that unlike other version control
    Daniel> systems, your working copy is separate from everyone else's, so
    Daniel> simply fetching won't actually change the files you have checked out
    Daniel> - you have to merge from the remotes into your working branch.

Ok, Thanks.

Is there anyway to get a list of changes that haven't been merged in
my local copy yet?
-- 
Brian May <bam at snoopy.apana.org.au>


More information about the Conkeror mailing list