Re: [git-users] Estimating the likeliness of a change leading to major conflicts

On 2020-11-17, at 8:35 AM, Tassilo Horn wrote: > Hi all, > > in some project with a quite large codebase and several independent > teams working on it, the following situation occurs every once in a > while: > > 1. Some developer is analyzing and fixing some bug reported to the > team.

Re: [git-users] how to get all blobs from remote server

On 2020-10-25, at 5:25 AM, Konstantin Khomoutov wrote: > Aren't you using Git in a way it wasn't supposed to be used? ;-) > Git is indeed a content-addressable filesystem in its core "In a way it wasn't supposed to be used" implies that there is a way it was supposed to be used. If there is

Re: [git-users] I need a safe command to make Git let my Desktop files alone

On 2020-10-25, at 6:05 AM, Anca Jain wrote: > Hi! I am a beginner to Git. I opened a folder located on my Desktop with “Git > Bash Here”. I run “git add.” without entering “git init” first. Now almost > all of my computer files (the ones on the Desktop) are in the “Untracked > files”

[git-users] [off-topic] Monitors and color

On 2020-09-10, at 9:25 AM, Philip Oakley wrote: > As someone with an eye injury, I really hate the matching trend for > **washed out grey fonts** that lack contrast on a classic white screen > (I have f.lux for a bit of night time dimming of the blue component). As someone with mild dyslexia,

Re: [git-users] Dark theme / Night mode

On 2020-09-08, at 8:51 AM, Alexander Sashnov wrote: > https://github.community/t/dark-theme/1592 > And all this time we have to look at exhaustingly white screens. You might be > aware of this 5-year old issue 157. Many people are concerned. This problem > is not about just some small

Re: [git-users] Screwed up merge - wrong branch - now I'm lost

On 2020-07-24, at 1:26 AM, SJW wrote: > > $ git checkout master > Switched to branch 'master' > > $ git merge staging > Updating b8a0e45..834dc62 > Fast-forward > > 23 files changed, 816 insertions(+), 550 deletions(-) > > ... lots of changes... Too many ... Oops! I meant to merge

Re: [git-users] Partial-Clone; is it time to reconsider the "do not store binaries in Git" recommendation?

On 2020-05-28, at 1:19 PM, Tassilo Horn wrote: > OTOH, why would you want to have your binary assets in a VCS? Nothing > valuable a VCS can do, i.e., diffing and merging, works for those > binaries. So IMHO, Git LFS and git-annex still have their right to > exist. Being able to recover an

[git-users] Triangular workflow support?

So looking up on Google and the various hits, "git triangular workflow", I saw several different articles describing several different methods, all rather old articles. What is the "best" current practices, with the features in current git, to support the "triangular" workflow consisting of:

Re: [git-users] Git Newbie

On 2020-01-15, at 9:19 AM, Subbu Subbu wrote: > How do you select the build software after doing a fork of your source in > github. How can multiple developers use github. Github is an entirely different beast than git. There may be people on this list that can help you, but that's a

Re: [git-users] Git Newbie

On 2020-01-15, at 9:19 AM, Subbu Subbu wrote: > How do you select the build software after doing a fork of your source in > github. How can multiple developers use github. Can you please clarify what you'd like to find out? -- You received this message because you are subscribed to the

Re: [git-users] Contributing to Git- Will it affect the Git I use in my projects?

On 2019-12-10, at 12:54 PM, Nirmal Khedkar wrote: > Hi, I'm Nirmal Khedkar, student from India. > > I wish to be a long-term contributer for Git and am a GSoC 2020 aspirant too. > I'd love to contribute to Git because I love it and (in my view), its the > mother of all FOSS projects out

Re: [git-users] Re: what is git add . ???

On 2019-11-21, at 12:44 AM, Uwe Brauer wrote: "PO" == Philip Oakley writes: > HI Philip > > >> Hi Uwe, > > [Snip]... > > >> So in Git, you can add 'everything', a few things, or even pick lines from >> files, for each commit, leaving the worktree (real filesystem content) >>

Re: [git-users] How does Git storing entire files rather than deltas make it superior?

On 2019-11-03, at 8:28 AM, Philip Oakley wrote: >> But you still need to control what gets merged into mainline or master, >> right? >> > If you change the management viewpoint from "control" (with all its baggage) > to "select" then it's a bit easier to see that the managers task got that

Re: [git-users] How does Git storing entire files rather than deltas make it superior?

On 2019-11-01, at 12:39 PM, likejudo wrote: > I was wondering if this isn't space inefficient - and how does it become > superior to a VCS by storing snapshots rather than deltas? Some people will cite studies showing that the pack files have better compression than you'd normally expect;

Re: [git-users] How do I avoid typing “git” at the begining of every Git command?

> Hi Michael, > > I was probably being over zealous in my differentiation. > > Git tends to follow the 'terminal command line interface' approach, which > (because of a single terminal view) would lead to the distinction I > highlighted, but that doesn't mean that Li

Re: [git-users] How do I avoid typing “git” at the begining of every Git command?

On 2019-06-12, at 1:51 PM, Philip Oakley wrote: > Hi Madhu, > > Git is designed as a unix/linux application, so by default it is a programme > that does a single requested action and exits. It does not 'hang around'. The > latter is a more 'Windows'/GUI style of operation. There are a lot

Re: [git-users] Retrieve all files of a group of projects as they were at a given date

On 2019-05-16, at 11:35 AM, Giorgio Forti wrote: > If I commit ONE file Git builds a "zip" that contains the actual situation of > ALL the 6 thousand of files in my C# solution? > And if I check out this commithe file Git gives me back the complete > situation at that moment? > This would

Re: [git-users] Only add files already known to git?

thank you! On 2019-05-15, at 3:01 PM, Philip Oakley wrote: > On 15/05/2019 15:59, Michael wrote: >> Is there a way to say "Only add files already known to git"? >> >> Like a "git add -only-known"? >> >> The idea is to update existing files,

[git-users] Only add files already known to git?

Is there a way to say "Only add files already known to git"? Like a "git add -only-known"? The idea is to update existing files, without adding new files. --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google

[git-users] Git for Windows and .NET?

Hello, What's the difference, Git-Windows-Minimal versus GitForWindows? In particular as NuGet packages. I do not see any .NET assemblies there? It appears to be a self-contained git environment? Or am I missing something? Thanks! Cheers, Michael W Powell -- You received this message because

Re: [git-users] I'm new to hacking and willing to pay $$$ for help

ontrol systems. And for you to say that you want your data entered illegally into a pharmacy is ... Well, ok, maybe you are a troll. I'll stop feeding you now. > > On Sun, Dec 23, 2018, 10:13 PM Michael ??? > > Hold on -- are you thinking "CVS" like the pharmacy chain? This

Re: [git-users] I'm new to hacking and willing to pay $$$ for help

??? Hold on -- are you thinking "CVS" like the pharmacy chain? This is "Concurrent versioning system", a way to track the history of a group of documents (typically the files used to compile a program, but it does not have to be) when they can be changed by multiple people at a time. On

[git-users] Grouping of git repos

GitHub allows you to create a project to group repositories. GitHub places a maximum size on files last time I checked. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it,

Re: [git-users] Collective noun for Git branch, tag, or revision

How about one of these: refish shaish commitish treeish Actually, "treeish" or commitish might be best -- you want to specify the state of a directory tree, and you are probably using something that identifies a commit, which identifies a tree plus a message. On 2018-11-26, at 7:20 AM, Philip

Re: [git-users] Help with collaboration, sharing/pushing changes, keeping history clean, etc.

On 2018-11-23, at 3:24 AM, Philip Oakley wrote: > > On 23/11/2018 01:29, Michael wrote: >> On 2018-11-22, at 2:49 PM, Philip Oakley wrote: >> >>> if it is just URL replacement then consider a smudge/clean filter so that >>> the worktree (local check

Re: [git-users] Help with collaboration, sharing/pushing changes, keeping history clean, etc.

aintaining my own "current", and keeping a readable history. Git for Windows, as I understand it, does straight rebasing and losing all history of patches; there has (?) to be better? right? imerge's "rebase with history" -- did anything ever come from that? > > P. >

[git-users] Help with collaboration, sharing/pushing changes, keeping history clean, etc.

I think that I am using git incorrectly. What I want to do is way too hard. I have forked someone's repository from GitHub. I had to make some initial changes to URLs to be able to run my version. I made changes that consist of code change, and a change log change. First issue: I want to make a

[git-users] Maintaining someone else's branch on a different branch

t the same as the "gh-pages" branch of my upstream. And renaming isn't an option. So, what's the syntax for dealing with (for example) keybounceMBP:AutoTrimps michael$ git remote -v origin https://github.com/keybounce/AutoTrimps (fetch) origin https://github.com/keybounce/AutoTr

Re: [git-users] pre-pull hook?

On 2018-09-28, at 12:03 PM, B. Lachele Foley wrote: > We talked about this at group meeting this morning. We had just been > discussing a realization similar to Michael Gersten's observation about > needing a "special merge" when we saw his post come in. Moments be

Re: [git-users] pre-pull hook?

On 2018-09-27, at 5:06 PM, B. Lachele Foley wrote: > I knew that a git-pull is a fetch followed by a merge. But, I had not seen > arguments for always splitting the process up. For newbies, I always > considered 'git pull' to be simpler when getting them up to speed. In this > case, you

Re: [git-users] Git tags and information as file header

something so I can see what version is actually being used. (I don't know git equivalent off the top of my head.) Does not work if people cherry pick from the repository directly, but then perhaps people should not do that... Michael. > On Aug 23, 2018, at 9:34 AM, Michael Brininstool wr

Re: [git-users] Git tags and information as file header

Wow! How condescending of you! In my 35 years of programming and system administration, tagging a script or config file with a label that identifies which "version" it is, is essential. When you deploy these files to 10's of thousand of servers, and problems crop up over the years, being

[git-users] Change in difftool behavior between 2.14 and later

Hello, I've identified a change in the behavior of "git difftool" between Git v2.14 and later versions of Git. In Git v2.14.*, when you use it like this git difftool ${sha1} ${sha2} ${some_file} and ${sha1} or ${sha2} point to HEAD and the working version of the file is unchanged, the difftool

[git-users] Git push receive action - Show PR Page in Webbrowser

Hi, I try to figure out how I can invoke a post push action which should be to invoce a webbrowser with the correct PR link which is displayed after a push to origin/remote like this: POST git-receive-pack (613 bytes) remote: remote: Create pull request for : remote:

[git-users] Using git gui to do a rebase

How do I do a rebase in git gui? --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to

[git-users] Re: Trouble with remotes/fetch/pull

I cannot believe how long I missed this: > upsream https://github.com/git/git.git (fetch) > upsream https://github.com/git/git.git (push) A spelling error. On 2018-06-15, at 12:41 PM, Michael wrote: > I am having trouble getting my remotes configured correctly. Basically, I >

[git-users] Trouble with remotes/fetch/pull

with a small local patch. But I can't even fetch the upstream. What am I doing wrong? Help please. keybounceMBP:git michael$ git pull warning: redirecting to https://github.com/Keybounce/git.git/ Already up to date. keybounceMBP:git michael$ git fetch warning: redirecting to https://github.com

[git-users] Marking a commit parent as not displayed by default

A few years ago (2009), the idea was put forward that some parents in a merge should be marked as "historical", or "uninteresting", and not displayed by default (http://softwareswirl.blogspot.com/2009/08/rebase-with-history-implementation.html) Does git currently have any support for this?

Re: [git-users] commit or no commit

On 2018-04-03, at 3:08 PM, KrzyJaski wrote: > After > git status > > I got this message: > Changes to be committed: > (use "git reset HEAD ..." to unstage) > > modified: root/node/chnode.c > modified: root/node/node.c > > Changes not staged for commit: >

Re: [git-users] Environment expansion in .gitconfig?

> On Apr 3, 2018, at 12:07 PM, Magnus Therning <mag...@therning.org> wrote: > > > Michael Forbes <michael.for...@gmail.com> writes: > >> Hi, >> >> I am trying to find a good solution to this use-case that seems to require >> expansion in

[git-users] Environment expansion in .gitconfig?

ans, however, that all commits will be logged as the last user who logged in - which mucks up the use case where multiple people might be logged in at the same time. Any suggestions for how to get git to work nicely in this case? Thanks, Michael. -- You received this message because you ar

Re: [git-users] Discard any change of a repository

On 2018-03-12, at 4:11 AM, Frank Röhm wrote: > Hallo > > sometimes it happens to me, that I clone a repo from my github account and do > some little but unnecessary changes, just to play a bit. > I want to discard them all now and surely I don't want to do any merge.

Re: [git-users] Using a FUSE with git?

On 2018-02-21, at 6:28 AM, Duane Knesek wrote: > However, I am intrigued by Google's use of a mono-repository. What makes the mono-repository work is the toolsets that Google and Microsoft use. To my knowledge, none of these tools have been released; they are

[git-users] How does npm git+file protocol work

edentials, etc, are all resolved as localhost (for instance) and/or configured in the user's global Git config. The folks with npm and/or npmjs.com are not especially responsive on the topic, much less helpful. Regards, Michael Powell https://docs.npmjs.com/cli/install https://github.com/npm/npm/blob/5e42

[git-users] Fetching part of a repository

Is there a way to get a partial repository, such as https://github.com/gnustep/gap/tree/master/user-apps/FlexiSheet without getting every app there? --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups "Git

Re: [git-users] tell git diff to ignore lines that were moved, but not changed

Hmm... My first thought: (Warning: This is more of a "what you should do next", not a "how to solve this now"): Git has no problem with file renames. So if a given block of text, or chapter, was its own file, then git would only show changes in the block rather than re-orders. But then,

Re: [git-users] Re: Doing a diff of different versions of a file

> So supposedly you'd need > > $ git diff :2:adobepass.py :3:adobepass.py Thank you! Would you believe I tried abodepass.py:1, and 1: adobepass.py, but did not realize that I needed :x: prefix? (I also thought that "0" was the common, and "1" and "2" were the two sides.) === Next

Re: [git-users] Re: Doing a diff of different versions of a file

> So supposedly you'd need > > $ git diff :2:adobepass.py :3:adobepass.py Thank you! Would you believe I tried abodepass.py:1, and 1: adobepass.py, but did not realize that I needed :x: prefix? (I also thought that "0" was the common, and "1" and "2" were the two sides.) === Next

Re: [git-users] Re: Doing a diff of different versions of a file

> So supposedly you'd need > > $ git diff :2:adobepass.py :3:adobepass.py Thank you! Would you believe I tried abodepass.py:1, and 1: adobepass.py, but did not realize that I needed :x: prefix? (I also thought that "0" was the common, and "1" and "2" were the two sides.) === Next

[git-users] Re: Doing a diff of different versions of a file

On 2017-10-31, at 7:53 PM, Michael <keybou...@gmail.com> wrote: > How do I get git diff to show me the difference between two different > versions of one file? > > I can say git diff tree-1 tree-2 > > I can say git diff file1 > > How do I ask for file1 in tree

[git-users] Doing a diff of different versions of a file

How do I get git diff to show me the difference between two different versions of one file? I can say git diff tree-1 tree-2 I can say git diff file1 How do I ask for file1 in tree-1 versus file1 in tree-2? --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this

[git-users] Specifying a minimum sha length?

So apparently, git doesn't want to refer to a sha unless you give at least 4 hex digits. Is there an option to turn it down to 3? --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups "Git for human beings"

[git-users] Specifying a minimum sha length?

So apparently, git doesn't want to refer to a sha unless you give at least 4 hex digits. Is there an option to turn it down to 3? --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups "Git for human beings"

[git-users] Help with update-ref

So I'm trying to pretty up some commit id's with a simple mining script. (Yea, I know, but I figure 5K sha tests isn't that bad). Here's my initial branch keybounceMBP:paperclips michael$ git branch -lv FrankV3 1f47df5 initial * Interface 1f47df5 initial master1f47df5 initial Here's

[git-users] "Freezing" Git submodule to specific hash

find any other documentation that would lead me to believe otherwise, but I just wanted to double check. All repo names and hashes are fictitious. Thanks! Best, Michael Powell -- You received this message because you are subscribed to the Google Groups "Git for human beings" group.

Re: [git-users] Issues with wrong merge to master

On 2017-08-30, at 1:30 AM, Prasanth Damodharan wrote: > I am facing below merge issue while using Git. Please let me know if you have > suggestions on how to resolve it > > 1. Feature branch (DEV_FEATURE1) got merged to master branch by mistake and > changes

Re: [git-users] Bringing back botched history in a rebaseable state

You might try 'imerge'. Git-imerge basically can construct a rebase, and it actually looks at all the commits along the way, rather than only the heads and merge-base. On 2017-08-28, at 3:28 AM, Marc Haber wrote: > On Mon, Aug 28, 2017 at 11:26:06AM +0300,

Re: [git-users] Adding a pull request (newer master) to my build

On 2017-08-12, at 12:50 AM, Philip Oakley <philipoak...@iee.org> wrote: > Michael, > > If that master and the PR979 branches have been merged and both tips are now > ahead of the merge point, then git itself has no way of deciding which side > of the merge is which. [you

Re: [git-users] Adding a pull request (newer master) to my build

On 2017-08-09, at 12:28 PM, Philip Oakley <philipoak...@iee.org> wrote: > Hi Michael, > > [don't abuse the fact that 'head' on windows will find the HEAD pseudoref > file, as there are a few cases where it fails - there's been mention recently > on the Git List i

Re: [git-users] Adding a pull request (newer master) to my build

michael$ git checkout -b Pull979 Switched to a new branch 'Pull979' keybounceMBP:obs-studio michael$ git rebase --onto head origin/master origin/pr/979 First, rewinding head to replay your work on top of it... keybounceMBP:obs-studio michael$ Nope, it did not apply anything to my current head. Help

Re: [git-users] Adding a pull request (newer master) to my build

michael$ git checkout -b Pull979 Switched to a new branch 'Pull979' keybounceMBP:obs-studio michael$ git rebase --onto head origin/master origin/pr/979 First, rewinding head to replay your work on top of it... keybounceMBP:obs-studio michael$ Nope, it did not apply anything to my current head. Help

Re: [git-users] Adding a pull request (newer master) to my build

On 2017-08-08, at 1:27 PM, Philip Oakley <philipoak...@iee.org> wrote: > Hi Michael, > > sounds like you need (one way of viewing the steps required) to rebase the > old series "take the total deltas " and apply that to a new branch taken from > 'current bran

[git-users] Adding a pull request (newer master) to my build

I'm looking for how to add a pull request, based off a newer master, to my master. The specifics: I'm trying to work with OBS 18.0.2 (version 19 won't run on my older OS). I'm trying to add in a pull request (979, https://github.com/jp9000/obs-studio/pull/979 ) to my build. That pull request

Re: [git-users] Re: git describe's way of choosing the "most recent" tag

On 2017-08-05, at 9:26 PM, G. Sylvie Davies wrote: > > # get most recent annotated tag (by time-of-tagging) > $ git for-each-ref --sort='-*committerdate' refs/tags | head --lines=1 > > # get most recent lightweight tag (by time-of-commit) > $ git for-each-ref

Re: [git-users] Git branch merge strategies

On 2017-07-25, at 5:38 AM, JNickVA wrote: > I have recently been put in charge of a code repository that contains a > MASTER and several branches. My task is to try to merge the root and the top > two most frequently used branches into a new repository. I face two

Re: [git-users] pull merge vs a local merge, what's different?

On 2017-07-20, at 4:11 PM, Jon Erickson wrote: > To start, the user that generated this error was advised to backout the > resulting munge and use a standard merge to fix his problems. Following > standard merging practices fixed his problems but his original approach

Re: [git-users] pull merge vs a local merge, what's different?

On 2017-07-20, at 4:11 PM, Jon Erickson wrote: > To start, the user that generated this error was advised to backout the > resulting munge and use a standard merge to fix his problems. Following > standard merging practices fixed his problems but his original approach

Re: [git-users] Beginner: delete 2 revisions

On 2017-07-21, at 10:09 AM, Konstantin Khomoutov wrote: > On Tue, Jul 11, 2017 at 10:23:12AM -0700, DynV Montrealer wrote: > >> I'd like to delete revision 2 & 5 on >> http://gist.github.com/WilliamCQ/4d734bf3e7c3ab59b08c949f1ab673d7 and have >> no idea how to proceed by

[git-users] Uncommiting a merge?

So I did a merge, edited the conflicts, and committed the result. Looking over the commit, I saw that I missed a conflict marker. No bigger. "git reset head^", fix it up, and re-commit, right? No, for some reason, that wants to commit a normal commit, not a merge commit. The second parent is

Re: [git-users] git cat-file on a submodule results in fatal error

hat is from some other repo - the submodule > repo. You will need to go find that repo before you could access that sha1, > (as I understand it). > > There is some ongoing development on submodules so I may be a bit > outdated. > > HTH > Philip > > - Origi

[git-users] git cat-file on a submodule results in fatal error

I'm trying to integrate a third-party code review tool with an instance of GitLab. In attempting to do so, I found that reviews weren't being created properly because GitLab's API was returning a 500 error. I dug into it and discovered that the call that was returning 500 was a call to display

Re: [git-users] Keeping Timestamps

On 2017-06-06, at 7:31 PM, Maurizio Vitale wrote: > Everybody else manage without restoring the timestamps, so it would be > probably easier if you described what you want to achieve. Here's the problem: Just because people "manage" without a feature doesn't mean the

Re: [git-users] Keeping Timestamps

On 2017-06-05, at 4:39 PM, Philip Oakley wrote: > Hi, yes it can be awkward when different systems make different choices about > which feature they want to use as the indicator for what they really want to > look at. For git the sha1 object id (oid) is what tells you

[git-users] Re: Inability to Commit/Push Git Changes

On Friday, May 26, 2017 at 6:17:43 PM UTC-4, Robert Glover wrote: > > Hi, > > I'm a new git user, and I am trying to clone a bare repository and having > difficulty making/pushing changes in the main/cloned repository. I believe > that I created the repository correctly under: > You don't

Re: [git-users] keeping two branches with partially different history in sync

Then I think it should be possible. Just need to know how to tell merge to only look at changes from "start of A's mergeable's changes to tip of A". And I don't know that. Or: Should be possible Limit merging to a range How do you do that? (Haiku because ... haiku) On 2017-05-17, at 8:54 AM,

Re: [git-users] keeping two branches with partially different history in sync

On 2017-05-17, at 8:35 AM, matevz.lan...@borea.si wrote: > Hi, > > orphaned branch would work, but is very inconvenient for the process we have. > > we would like for some people to work on A and commit patches to A. > other people to work on B and commit patches on B. > > Once a week we

Re: [git-users] keeping two branches with partially different history in sync

AHH... So what you want is a new, orphaned branch of changes, and you want to merge that new branch into both A and B. Correct? I'll let someone that knows how to set that up chime in. On 2017-05-17, at 6:33 AM, matevz.lan...@borea.si wrote: > Hi, > > > You have a common source "master". >

Re: [git-users] keeping two branches with partially different history in sync

On 2017-05-16, at 1:36 PM, matevz.lan...@borea.si wrote: > Hi Michael, > > that would work normally, however we have a problem that we can not keep > common master and we need to split the master to A and B. The base code > changes are huge and there is no way for us to eve

Re: [git-users] keeping two branches with partially different history in sync

Let me see if I understand this correctly. You want two things that differ from a common master by a few private commits, such as Master = A, B, C, D, I, J, K, L, M branch A = E, H, plus master branch B = F, G, plus master Did I understand that correctly? If so, I think that either doing

Re: [git-users] How to get a highly complex branch straight?

On 2017-05-05, at 11:47 AM, Markus Hitter <m...@jump-ing.de> wrote: > Am 05.05.2017 um 19:43 schrieb Michael: >> I read as much as I could about the Mikado method, and it turned out that >> all the basics of the method are available, either in their website, or >>

Re: [git-users] How to get a highly complex branch straight?

On 2017-05-02, at 12:47 PM, m...@jump-ing.de wrote: > > > > The Mikado method [2] is one approach to avoiding a merge hell of trying to > > do everything at once. > > Here's another method I use for several years already, with great success: >

Re: [git-users] Re: How to get a highly complex branch straight?

On 2017-05-02, at 10:22 AM, m...@jump-ing.de wrote: > > As nobody knew an answer, so I started trying rebase strategies (-s, -X > options), one by one. Using 'git rebase -s recursive -X ours ...' was the > only one which did something useful for this self-rebase and also worked with > a

Re: [git-users] How to get a highly complex branch straight?

This sounds like you need "iMerge". Incremental merge -- basically, every small, tiny diff is made, so that all conflicts are tiny. Doesn't mean that they all are easy. If you've ever had one change made in multiple small commits, then things can still be difficult. On 2017-04-30, at 6:47 AM,

Re: [git-users] Help with git pull, and restricting what gets pulled

Thank you very much. > Where did you "explicitly ask for pull request 12121" remote tracking branch, > in order for it to be shown here? I haven`t seen that command in your e-mail, > so unless you accidentally omitted it, you didn`t actually ask for it... yet. When I said > 843 git fetch

[git-users] Help with git pull, and restricting what gets pulled

and play with, and I was told to add this line: fetch = +refs/pull/*/head:refs/remotes/origin/pr/* Which worked -- I was able to say 843 git fetch origin refs/pull/12121/head No problem. What was the problem? Doing an update. keybounceMBP:youtube-dl michael$ git pull master fatal: 'mas

Re: Re: [git-users] Help with rebase?

On 2017-03-25, at 5:38 PM, Igor Djordjevic <igor.d.djordje...@gmail.com> wrote: > Hi Michael, > > Having some more time now, here`s a bit more elaborate answer, mentioning the > rebasing flow, if you prefer that instead. > > On Saturday, March 25, 2017 at 2:22:09 A

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

On 2017-04-04, at 6:32 PM, bestbrightestandthens...@gmail.com wrote: > I have two directories. The one called bitbucket/source contains the cloned > repository which was set up by another developer and the other one is called > bitbucket/sourcecode which contains the same from my localhost so

Re: [git-users] Re: I have to figure out git by Thu or be fired...

On 2017-04-03, at 8:19 PM, bestbrightestandthens...@gmail.com wrote: > I've tried adding to the .gitignore file but I can't seem to get git to > ignore anything. What did you put in the .gitignore file? Can you send a copy of it? --- Entertaining minecraft videos http://YouTube.com/keybounce

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

On 2017-04-03, at 8:18 PM, bestbrightestandthens...@gmail.com wrote: > The .gitignore file doesn't result in anything being ignored. It's still > looking at these .gif files, not only that buy jquery library files too. I > can't even create a branch since all I get are these needs merge

Re: [git-users] Re: I have to figure out git by Thu or be fired...

On 2017-04-03, at 11:44 AM, bestbrightestandthens...@gmail.com wrote: > I just need some sort of tutorial. I will see what I can find on youtube. > It's a rather odd product compared to other source safe systems I have used > in the past. The Microsoft systems I can figure out in 5 minutes

Re: [git-users] Re: Help with rebase?

On 2017-03-24, at 6:08 PM, Igor Djordjevic <igor.d.djordje...@gmail.com> wrote: > Hi Michael, > > On Thursday, March 23, 2017 at 10:10:02 PM UTC+1, Michael Gersten wrote: > I need help with the syntax of rebase. > > I have a branch, "Dish", that was bran

[git-users] Help with rebase?

I need help with the syntax of rebase. I have a branch, "Dish", that was branched off of master. This was about a month ago. Making a new branch off master, and merging Dish into it, worked just fine. No problem. Now, I have "master", and from it, "merged-dish". Time to update master. All

Re: [git-users] News: Git Virtual File System

On 2017-02-07, at 9:47 AM, Hugh Gleaves wrote: > This is extremely promising: > > https://blogs.msdn.microsoft.com/visualstudioalm/2017/02/03/announcing-gvfs-git-virtual-file-system/ ... I detect a sense of humor: "repos of unusual size!", "For example, the Windows

Re: [git-users] More on that "merge branch checkout" problem -- cannot abort/go back?

y #2: The three versions in the conflict file were "nothing" (the old develop that had none of these changes), "what was checked in" (the feature branch), and "everything"; what I wanted was "everything - what was checked in" (which is what git diff r

Re: [git-users] More on that "merge branch checkout" problem -- cannot abort/go back?

On 2017-01-29, at 11:32 PM, Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: > On Sun, 29 Jan 2017 11:07:34 -0800 > Michael <keybou...@gmail.com> wrote: > >> So since my attempt to switch branches with the "merge" flag (-m) >> gav

[git-users] More on that "merge branch checkout" problem -- cannot abort/go back?

So since my attempt to switch branches with the "merge" flag (-m) gave me an error, I thought I'd try to go back. keybounceMBP:Finite-Fluids michael$ git merge --abort fatal: There is no merge to abort (MERGE_HEAD missing). keybounceMBP:Finite-Fluids michael$ git status On bran

[git-users] Unexpected conflict after using git gui to check in a few lines

so would overwrite my local changes. Here's the offending block after the merge: keybounceMBP:Finite-Fluids michael$ git checkout -b cleanup develop error: Your local changes to the following files would be overwritten by checkout: src/main/java/com/mcfht/realisticfluids/FluidData.java

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

On 2017-01-27, at 12:57 AM, Philip Oakley wrote: > > It doesn't happen at my work, but one has to ask how / why have we dug the > hole so deep and wide that this gross merge conflict continues to repeat it > self as a regular corporate activity, and then how to get out

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

> Have you looked at git-imerge? Imerge looks like a really nice tool. How stable/sufficient is it? Why is it not part of the normal git distribution? I noticed that it was still getting dev work this month, and in the last two years a bunch of people forked copies of it, and made their own

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

On 2017-01-26, at 1:12 PM, Philip Oakley wrote: > > Is the project well modularised with no file >100 lines (excepting, maybe, > well developed libraries that never change), 100 lines per file?? You're joking, right? That's one of those "in theory" things, right?

  1   2   3   4   >