Re: [git-users] What's the best course of action when you need a file from another branch that is not yet merged with master?

On Tuesday, February 28, 2017 at 9:52:11 PM UTC+1, Philip Oakley wrote: > On Tuesday, February 28, 2017 at 5:28:14 AM UTC+1, AD S wrote: > >> The statement that git will have problems is untrue, as long as it is the >> same file/filename in the same place/path. > > Your changes to it will

[git-users] Merging my branch into a remote repo, I encounter a merge conflict with a file I have not touched in my branch. What is the best course of action?

I am in the process of merging my branch into a remote repo (that others contribute to as well). I get a merge error on a file I have not touched in my branch. Curious I open the file, expecting to see the merge conflicts highlighted, eg: *<<

Re: [git-users] What's the best course of action when you need a file from another branch that is not yet merged with master?

Cheers! Yep, that's the desire. On Wednesday, March 1, 2017 at 10:29:29 AM UTC+10, Philip Oakley wrote: > > don't forget the space between -- and path/to/file.ext > > the command would overwrite your current version with the version from > --their, is that the desire? > > -- You received

Re: [git-users] What's the best course of action when you need a file from another branch that is not yet merged with master?

don't forget the space between -- and path/to/file.ext the command would overwrite your current version with the version from --their, is that the desire? - Original Message - From: AD S To: Git for human beings Cc: philipoak...@iee.org Sent: Tuesday, February 28, 2017

Re: [git-users] how should I structure a repo to support 3+ builds from one source tree ?

yep! the symlink is working pretty well for now, I'm going to stick with it and see where it takes me thanks! On Tuesday, February 28, 2017 at 5:52:59 PM UTC-5, Magnus Therning wrote: > > > Al J writes: > > > > > > > I’m building 3 deliverable versions of kiosk

Re: [git-users] how should I structure a repo to support 3+ builds from one source tree ?

Al J writes: > > > I’m building 3 deliverable versions of kiosk software from one repo, and I > foresee a PITA coming down the road at me > > > I've got base classes in a common area and subclasses with the differences > > > Right now I’m using a symlink, repointed with

[git-users] Suggestions for writing git hooks?

Hi all! A colleague wrote a simple pre-commit hook that has been serving us well so far. Now I'd really like to extend it though (to support linting for multiple languages, among other things). Our current hook is written in bash, but I find shell scripting a bit too error prone :( What are you

Re: [git-users] When I update a branch from master I don't get the same files as when I create a new branch. Would anyone know why?

AD S writes: > When I update my branch from master it pulls down several files, including > some sass files. When I compile, however, gulp alerts me that I am missing > .scss files. > > I tested this by creating a new fresh branch and running gulp sass. This > time there

Re: [git-users] What's the best course of action when you need a file from another branch that is not yet merged with master?

- Original Message - From: AD S To: Git for human beings Sent: Tuesday, February 28, 2017 4:28 AM Subject: [git-users] What's the best course of action when you need a file from another branch that is not yet merged with master? I am new to git. I'm working on a large

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

On Thu, Feb 9, 2017 at 11:58 AM, Stephen Morton wrote: > Thu, Feb 9, 2017 at 11:53 AM, Stephen Morton > wrote: > >> >> >> On Thu, Feb 9, 2017 at 10:48 AM, Igor Djordjevic < >> igor.d.djordje...@gmail.com> wrote: >> >>> On Thursday,