How can I find out which Git commits cause conflicts?
I'm merging upstream changes to my project, and recently there were a lot of commits that created a lot of merge conflicts. It doesn't make sense to try to resolve them all at once.
How can I find out which commits create a conflict? Any of the following are acceptable:
- A way to make Git stop merging as soon as it finds a conflict
- A way to make Git list all the commits that conflicted, in chronological order
- Anything else that lets me resolve the conflicts one-by-one, in chronological order, that doesn't involve merging a few commits at a time hoping to stumble upon the conflicts
I have a git repo containing many folders. I need to find out what files have changed in one of those folders between two commits. Is there a nice way of doing this?
I'm trying to automate some Subversion processes and I'm running into problems with conflicts. When I merge two branches, sometimes I get tree conflicts and regular (text) conflicts. I'd like to be ab
I am working on a research to study merges in open source projects. I recently asked How can I find all the commits that have multiple parents in a Mercurial repository?, and got a very good answer. N
I'd like to know what stored procedures are currently running to diagnose some performance problems. How can I find that out?
I'm working in a git-svn cloned repository. I've got a git branch tracking a Subversino feature branch, which I've made a load of commits to, and have dcommited them to Subversion. Merging that Subver
Is it possible for me to 'git commit --amend' 2 commits AFTER I have pushed? git commit git push git commit git push Can I some how combine the 2 commits that I did? Thank you.
I want to create Perl scripts that run on older OS X machines as well as on current versions. Is there a list or a resource where I can find out which Perl versions were distributed with older Mac OS
I have done a series of commits and now I'm seeing that I would have liked to have 2 commits merged. Not the last two, but a bit further away My log: commit 326f35d83963660893d065e480f231b76f052dd2 Au
While git-blame and counting number of lines changed by an author within a git repository are helpful, is there a command that can list all of the pathnames modified in a repo across all commits by ei
My Objective is keep logs line by line with RichtextBox control, But I am worry that when the lines reach to certain point , my window form will be hung or run of out memory.. Can any one show me how
Say I have the SHA for a blob. I can go git show and see the contents of the blob. Is it possible to get a list of all the commits that contain that blob?
Commits obviously have an author associated with them; but is it possible to find out which user created a tag on a Git repository?
There are a number of useful business logic classes which seem to exist in both iOS and MacOSX (for example, NSMutableDictionary). However as far as I can see the developer documentation does not ind
On the surface, this may seem the same as a million similar questions about altering history in git repos, but I believe my case is a bit different and I haven't found a solution that works for me. I
I commented out a gem, but 'bundle install' still won't run. How do I find out which gem has a dependency on sys-proctable? $ bundle install Fetching gem metadata from https://rubygems.org/.........
I checked out 'production_branch' then did a merge of 'master_branch for_production_branch' there were massive conflicts. 'production_branch' has been deployed to production. But the conflicts require
Imagine a class within a git project that has undergone 1000's of commits, re-visited over and over. Is there any chance for me to examine when exactly (at which commit) a specific line of code was in
I have a legacy C++ application with a deep graph of #includes. Changes to any header file often cause recompiles of seemingly unrelated source files. The application is built using a Visual Studio 2
I'm having trouble understanding how a git merge works in terms of the commits created by the merge process. I've read the relevant sections in pro git and the git community book, but am still confuse
Is there any way to review list of conflicts (names of conflicting files and number of conflicts in it)? The only thing I have discovered is to review pre-created .git/MERGE_MSG file... but this is no
I want to find the most recent commit that modified a source file. I can use git blame to see all the dates for commits by each line, but it’s difficult to see exactly which commit was the last one t
I am working on a research to study merges in open source projects. For each merge in the repo I need to find the base (nearest common ancestor), the two contributors, and the resulting merged commit.
Example: in package io the type ByteReader defines an interface that wraps the method ReadByte() (c byte, err error). What is the easiest way to find out which types in the standard library (i.e. list
I am writing a custom git command that should only run in a completely new repository with no commits (see this question). How can I perform a simple check within my script to see if an existing repo
This question already has an answer here: Using Git, show all commits that are in one branch, but not the other(s) 7 answers I have two branches - master and experimental. How can I see which c
How can I find out inside of a pushed VC, which VC called this function (who is calling me to arrive): in .m of calling controller: [self.navigationController pushViewController:calledViewController a
Is it possible to get info about how much space is wasted by changes in every commit — so I can find commits which added big files or a lot of files. This is all to try to reduce git repo size (rebasi
Possible Duplicate: Using Git how do I find modified files between local and remote How can I see incoming commits in git? Or even better, see what I just git fetch/git pulled? Edit: To clarify the
I have a git superproject that references several submodules and I am trying to lock down a workflow for the rest of the my project members to work within. For this question, lets say my superproject
In this Google IO 2009 presentation, a GIT url is provided in the slides. The URL looks like this http://android.git.kernel.org/?p=platform/development.git;a=commit; h=a42091afb7b122c753f9050ff5dbcb79
I don't really care when the mock is called - pretty much, i'm migrating a bunch of mocks into real world code, because mocks in an integration test are sometimes pretty stupid. Anyway, here i am with
Here is my tree: C (featureB) | | A - H (master) | | |- H - D (featureA) I would like to make it become C - D (featureB) | | A - H (master) | | |- H - D (featureA) How do I do this in git?
I'm new to GIT and I think my merge wiped out some other people's work. Ouch. I heard that its best to avoid the GIT merge workflow, and to rebase commits (locally) so you put your commits as clean co
Every time I do a merge I need for a merge commit to be generated and I would like it to have more than just the summary of all the commits. My question is how can I format git-fmt-merge-msg or what d
On some machines my C# app crashes when started. How to find out what is the cause of the problem? Where to start my research? When I get managed exceptions I have nice StackTrace and exception messag
What is a regular expression I can use in Vim to find conflicts in CVS and possibly other version control systems?
Background I'm working with just one branch - master. 3---------2--------- | 6-------5---------4---------1---------- I made commits 1-3, then realised I wanted to work from commit 1 for the next sec
I do the following string of commands for git and my fingers are getting tired of typing them. :) git add . git commit -m 'Some message' git push cap deploy How can I combine those (including adding
I have a file that has broken somewhere down the line, and I have found the last point in which it was still fixed. I would like to know how, using git, I can compare one file from two commits, or in
I'm trying to contribute to open source software for the first time, but I'm pretty inexperienced with version control systems. In particular, right now I want to make a number of changes to different
From what I've learned here about submodules, I can now roll my submodules back to the right commit by using git submodule update --recursive however, now the submodules are never (rarely?) in a bran
This gives a good explanation of squashing multiple commits: http://git-scm.com/book/en/Git-Branching-Rebasing but it does not work for commits that have already been pushed. How do I squash the most
I have a Git repository with few branches and dangling commits. I would like to search all such commits in repository for a specific string. I know how to get a log of all commits in history, but thes
The kernel parameters are stored in on-chip shared memory. Shared memory can have bank conflicts if threads try to access the same bank. So my question is: does that mean that using kernel parameters
Normally I'd work in a git feature branch let one of my colleagues review my work before merging it to master, but I had to do some work directly in the master branch, so all of my commits are now int
I have a windows network (peer-2-peer) as well as Active Directory and I need to log the name of users who send any kind of print to the server. I want to write a program to log their username and/or
How do I find out which executables or processes are using my shared library objects in a Unix environment, specifically the AIX environment. Is there any command for it?