logstash-plugins / logstash-filter-csv

Apache License 2.0
15 stars 41 forks source link

Rebased skip_header feature commit #63

Closed AbdulHaseebHussain closed 6 years ago

AbdulHaseebHussain commented 6 years ago

Apologies, I've redone the skip_header changes on a separate branch.

guyboertje commented 6 years ago

You will need to rebase because I merge the asciidoc changes. To rebase follow this workflow (assumes you have setup a remote called upstream that points to the original plugin repo, your fork will be called origin afaik)

  1. pull in latest upstream master
    
    $ git checkout master

$ git fetch upstream $ git merge upstream/master

2. rebase branch against master

$ git checkout feature/foobar $ git rebase master

3. push to your forked repo
If you rebased, you are changing the history on your branch. As a result, if you try to do a normal git push after a rebase, git will reject it. Instead, you'll need to use the -f or --force flag to tell git that you really know what you're doing. Note that you typically want to avoid using -f on shared branches.

$ git push origin feature/foobar -f

guyboertje commented 6 years ago

All looks good, I await the rebase before I merge.