Questions tagged as 'git'

Tagged questions
2
answers

Branch x Checkout x Automatic Merging for master

Help! If someone has gone through this or knows how to help, thank you. I created a branch: git branch <xxxx> switch to new branch: git checkout xxxx I changed a file line inside the xxxx I returned to the...
asked by 07.07.2016 / 19:11
1
answer

Change between branchs in the GIT and changes keep in the current branch

Well, I had a question and when I asked the question here on the same topic that I'm opening I answered myself but I decided to continue to help someone who might have the same doubt. My question was how to make changes to a branch and make t...
asked by 29.09.2015 / 22:16
1
answer

Create a patch from a commit

When you run the command git apply you can create a commit with changes from a text file: git apply ~/Downloads/patch.txt How do I create this patch file from an existing commit ?     
asked by 13.06.2017 / 22:09
1
answer

How to resolve merge conflict with git?

I had a merge conflict problem in git. This problem happened when two people were making the same modifications to the same file. The first person did the commit and I went to make another commit after her. Git refused and I tried three more tim...
asked by 28.04.2016 / 22:24
1
answer

Git Accuses Ignored Directory Has Modified Content

I have the content directory in my .gitignore file, as follows: app/dir/* But when I give git status , git says the following: # On branch master # Changes not staged for commit: # (use "git add <file>..." to update w...
asked by 05.03.2014 / 15:39
1
answer

Prevent git merge when conflict exists

When I'm using GitHub for Desktop, and do a pull or push, the App just informs you that a file is in conflict and nothing happens. but when I use gitbash, it automatically starts a merge. I would like every time I make a git pull or...
asked by 11.06.2018 / 12:06
1
answer

Error in GIT when sending project to Ionic Pro: fatal: sha1 file 'stdout' write error: Broken pipe

I have signed Ionic Pro and am trying to send my local project to their Cloud. I use the command: git push ionic master It starts well but gives the following errors: git push ionic master Enter passphrase for key 'C:\Users\Ramos\.ssh\...
asked by 12.01.2018 / 18:31
2
answers

GIT: project with 2 versions in different clients and main branch

I have a question about the GIT organization. I have 1 project that will divide into 2 versions for different clients, I would like to maintain a main branch and that the generic changes would be made in this branch and replicated for the 2 v...
asked by 27.11.2017 / 14:16
1
answer

Integration test connected to an FTP

Is it possible to e-or if there is a tool that allows me to send certain files from a project to an FTP after it passes a continuous integration test (Travis-ci for example)? The idea is that after I commit and the test is completed and pass...
asked by 26.03.2014 / 20:26
1
answer

Number of revisions per file saved via Git

I have a very specific need, I need to store at most 3 revisions of a PSD file, with each new revision being deleted. Is it possible to do this in Git?     
asked by 16.09.2014 / 14:43