Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitflow
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tools
gitflow
Commits
11965b32
Commit
11965b32
authored
Sep 06, 2010
by
Vincent Driessen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added two FAQs.
parent
c213052c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
0 deletions
+32
-0
README.mdown
README.mdown
+32
-0
No files found.
README.mdown
View file @
11965b32
...
...
@@ -58,6 +58,38 @@ For Windows users, [msysgit](http://code.google.com/p/msysgit/) is a good
starting place for installing git.
FAQ
---
* **Can I still do manual branches and merges when I use git-flow?**
Of course you can. ``git-flow`` does not forbid you to keep using vanilla Git
commands!
So if you want to merge `master` into `develop` for whatever reason you want
to, you can safely do so without breaking `git-flow` compatibility. Do you
want to manually merge a feature branch X into another feature branch Y? Not
a problem. As long as you do it conciously and realize what this means for
finishing those branches later on.
* **I'm getting errors when I use flags with git-flow!**
``git-flow`` uses the [shFlags](http://code.google.com/p/shflags/) library to
provide platform independent flag parsing (using wichever low-level flag
parsing libraries like `getopt` or `getopts` are available). However,
`shFlags` does not work too well on a few platforms that haven't been tested
originally. This results in errors like this:
flags:WARN getopt: option invalide -- 'f' -- 'init' flags:FATAL unable to parse provided options with getopt
The platforms that suffer these errors include:
- Gentoo
- Ubuntu
- Redhat Enterprise Linux
There are open issues related to this: #28 and #39. Unfortunately, there is
no simple fix for it and all hope is placed on the Python rewrite of
`git-flow`, see issue #33.
Please help out
---------------
This project is still under development. Feedback and suggestions are very
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment