|
Is Trac pretty much the best game around when it comes to source browsing & ticket management? I'm using Github for public stuff but for internal projects that have no need to be put out into the public I've been using SVN and thinking about Trac (although it's kind of  to get working under FastCGI)
|
#
¿
Aug 25, 2009 18:49
|
|
|
|
| # ¿ Apr 29, 2024 12:53 |
|
|
Okay I'm git-stupid and really stuck. I'm working with a project that other people are doing work in their won git forks on. Someone has several branches they want me to merge back. The problem is some of the branches have work on files that are completely removed so 'git merge branch1 other-remote/branch2' won't work because files are modified in other-remote/branch2 that no longer exits in branch1. It's work that I can just reject, so is there a way to merge all the changes for files that exist and just reject stuff that references files that no longer exist?
|
|
#
¿
Apr 15, 2010 21:58
|
|
|
I simply didn't think about marking the file as removed on the working branch. Thanks, this git stuff is way too meta for me still.
|
|
#
¿
Apr 15, 2010 22:23
|
|
|
Oh I've read piles of stuff on git. The man pages are the typical overly technical man page that already assumes you know everything, and the rest of it is just way different from svn. I'll get it eventually since I'm working more and more with github and have actual projects to do instead of abstract concepts.
|
|
#
¿
Apr 16, 2010 02:45
|
|