Questions tagged as 'git'

1
answer

GIT: Problems with conflicts when there is white space

I do not know what's happening with the repository I'm using, but all the programmers who are using it are contemplating the same conflicts after pull . And often these conflicts are caused by simple spaces that are added to or removed...
asked by 10.04.2015 / 19:07
1
answer

Resolve apport-GTK, dkpg, and Git related errors

I was using Git on Linux and removing a branch I did not want to use, I probably removed other things. It ended up giving an error in apport and dkpg. Regarding Git, it just lets you continue in the branch master. When switching to other...
asked by 30.08.2014 / 05:28
1
answer

Conflict resolution with Meldmerge (Git, Github)

Thetooldoesnotallowmetouploadchangesfromthemiddlefile,thesearethenewchangesthatIneedtocommit,butitisnotgoing,itispreciselythischangethat"he wants" to overwrite with one of the two next, which are outdated. How to proceed? This occurred whe...
asked by 31.08.2014 / 16:52
1
answer

Original site does not accept CSS that in localhost is working

I use GIT for versioning the project in development. I have a form made with Contact Form 7 and to change its default, I changed some classes with css . In the local version it worked. However, when committing to the server, CSS is not acce...
asked by 07.05.2014 / 14:08
0
answers

Difference between URL FETCH and URL PUSH

Hello Querying my remote origin via command git remote show origin I get the return: $ git remote show origin * remote origin Fetch URL: [email protected]:/var/git/Projeto.git Push URL: [email protected]:/var/git...
asked by 13.11.2018 / 15:18
1
answer

Authentication error when sending file to repository in Github

Well, I followed the steps in this link , but when I arrive in git push -u origin master it asks the git user and password in a windows forms, then asks the user (2 line), and asks for the SSH password, and I did not even set this passwo...
asked by 26.07.2018 / 20:41
3
answers

How do I enable version control in VisualCode?

I'm having difficulty using VisualCode version control, all the changes I make on the system are not going to version control, my question is if I need to install a specific extension for this to work?     
asked by 31.07.2018 / 04:18
0
answers

fatal: does not appear to be a git repository

I'm trying to set up a private Git repository on shared hosting via SSH. I make the whole process of setting the keys etc, and giving git init in the repository but when I put git remote add deploy ssh://USUARIO@IP-DO-SERVIDOR:2222/p...
asked by 14.07.2018 / 22:23
0
answers

"git status" command does not show changed files inside folders [closed]

The structure of my folder is this: If I change (without editing the code) some file inside some of these folders (Calculator, caraCoroa, etc), when I run git status it does not list any modified files, why does this occur? For exa...
asked by 03.07.2018 / 23:08
2
answers

Recover deleted files with git

I created a repository in github, gave the git init of my folder and after that I did the foolishness to give these two commands below, after that my files that were in my folder are gone ... how to get back the files? I had not yet committed an...
asked by 21.07.2018 / 19:24