How to resolve a large number of conflicts in git merge?

Can I choose which branch to use like svn?

From [Gitdiscussion group] 2017-05-02 09:42:11 0  1  526

Frontend - Error while pulling code on webstrom?

Your local changes to the following files would be overwritten by merge: Looking for answers, there are all ki...

From [Gitdiscussion group] 2017-05-02 09:43:08 0  1  524

windows - Git Bash 混乱

我在使用Git的Windows版本时遇到这样一个问题，当我输入git log命令，然后输入q退出log，接着输入其他命令就会导致整个Git Bash的界面内容混杂在一起，比如我在输入git log后输入git check...

From [Gitdiscussion group] 2017-05-02 09:21:57 0  2  524

git怎么忽略已经提交过的文件

需求描述 git提交到master分支上我们是自动部署到线上的，但是有个配置文件线上和本地是不一样的，所以第一次提交线上配置，然后把这个文件忽略，修改成本地配置，远程仓库里的配置文件保持不变，这个要怎么设置...

From [Gitdiscussion group] 2017-05-02 09:21:40 0  1  524

About git staging area

Why does git have a cache area? What is its main function and what problem does it exist to solve?

From [Gitdiscussion group] 2017-05-02 09:27:06 0  1  523

git操作，hexo部署到gitcafe的分支

一开始我是直接把整个文件夹全push到master 然后建了一个分支gitcafe-pages,想把hexo的/public下的文件都传上去，但是这样分支下面始终都是以\public文件夹开始,这样我访问分支地址的时候必...

From [Gitdiscussion group] 2017-05-02 09:22:36 0  1  523

I'm a newbie using github and git, and I encountered some small problems. I'd like to ask for advice.

What does it mean?

From [Gitdiscussion group] 2017-05-02 09:42:18 0  2  520

git - source merge branch

The operation is like this: Develop A: Change the A file code. commit, push. Develop B: Change the B file code...

From [Gitdiscussion group] 2017-05-02 09:34:38 0  1  520

git - Looking for a simple introduction to code review phabricator

I installed it on the server and made basic configurations, but I don’t know how to use it. The official docum...

From [Gitdiscussion group] 2017-05-02 09:35:17 0  1  517

About git tag

On github, you can download certain codes in the release and compile them into executables, but how do you put...

From [Gitdiscussion group] 2017-05-02 09:24:55 0  1  517

brackets编辑器下面怎么使用git啊

觉得这个ide不错。 但是不知怎么把项目push到git上面。 brackets编辑器有个git插件https://github.com/zaggino/brackets-git 看了一下还是不知道怎么pull push...

From [Gitdiscussion group] 2017-05-02 09:22:14 0  0  517

Windows下的git能否配置成这样

在Windows上每次使用git时,都必须输入 git xxx xxx,每条命令需要"git",浪费了很多"能量" 我看到zsh中把配置了很多git的alias,非常实用(见图片)...

From [Gitdiscussion group] 2017-05-02 09:18:33 0  2  515

How to check if the git repository is complete?

How can I check if a file in the git repository is damaged?

From [Gitdiscussion group] 2017-05-02 09:30:46 0  1  514

git - How to convert literal code alternately?

%u6587%u5B57%u4EE3%u7801%u5982%u4F55%u8F6C%u6362

From [Gitdiscussion group] 2017-05-02 09:40:43 0  0  512

Can a remote repository be automatically created during git push?

Every time you create a new project on the development machine, then go to the git server to create a new proj...

From [Gitdiscussion group] 2017-05-02 09:33:27 0  2  512