S
S
Sergey Korenevsky2021-11-22 02:00:21
git
Sergey Korenevsky, 2021-11-22 02:00:21

How to format .GITIGNORE for GITHUB?

There is a repository on GitHub . Files written in .gitignore file

mod_multi_form-update.xml
.gitignore
README.md

But after the publication of Release
Each time, the package archive contains all the files from this repository.
What do the lines with <<<<<<< and >>>>>>> symbols mean in .gitignore ?

Answer the question

In order to leave comments, you need to log in

2 answer(s)
S
Sergey Kuznetsov, 2021-11-22
@Dier_Sergio_Great

How to format .GITIGNORE for GITHUB?

The correct answer to the question is no.
The .gitignore file is not used in the GitHub service.
But after the publication of Release
Each time, the package archive contains all the files from this repository.

Did you expect something else? What you put in the branch is what you will see in the release.
Adding file masks to .gitignore does not remove any files from the project.
If you want to delete a file, delete it directly from the repository branch.
What do the <<<<<<< and >>>>>>> lines mean in .gitignore?

Specifically, in .gitignore they mean nothing.
This is how a merge conflict that you had in this commit is indicated and you did not resolve it and committed it as it is. It wasn't worth doing that. There should be no unresolved conflicts in the repository.
You don't really have a conflict here. Just delete lines with markers and other garbage lines.
<<<<<<< OURS 
=======
>>>>>>> THEIRS

the XML file must be loaded by URL but must not end up in the archive.

Use different branches for the site and for the archive with the release and you will be happy. By default, the GitHub Pages site is stored in the gh-pages branch. Why did you lump everything together and use the master branch for both the site and the project itself?

V
Vasily Bannikov, 2021-11-22
@vabka

>>>>>>>
are conflicts.
And why shove .gitignore into itself?)
And in general, it should not affect the build in any way)
So the build system and CVS are orthogonal things
And github has nothing to do with it at all)
Look for problems in the builder config

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question